From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Wed, 28 Jan 2015 03:59:33 +0000 (-0300)
Subject: Merge from origin/emacs-24
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3383^2~53
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3a8b7013042adae3c27327a75662fd8e884d4896;p=emacs.git

Merge from origin/emacs-24

The following commit was skipped:

d7af65d Backport: Unbreak `mouse-action' property in text buttons
---

3a8b7013042adae3c27327a75662fd8e884d4896